Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dpp: update to v10.0.29 #2938

Merged
merged 5 commits into from
Dec 12, 2023
Merged

dpp: update to v10.0.29 #2938

merged 5 commits into from
Dec 12, 2023

Conversation

Bricklou
Copy link
Contributor

No description provided.

@waruqi
Copy link
Member

waruqi commented Dec 12, 2023

It does not work for windows.

"C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.37.32822\\bin\\HostX64\\x64\\cl.exe" -c -nologo -O2 -fp:fast -std:c++17 -MT -Iinclude -Iinclude\dpp -DDPP_BUILD -DDPP_USE_EXTERNAL_JSON -DWIN32 -D_WINSOCK_DEPRECATED_NO_WARNINGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DFD_SETSIZE=1024 -DSODIUM_STATIC /EHsc -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\f\fmt\10.1.1\adc308aa1dfc472ab92a30abb14e2d6f\include -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\n\nlohmann_json\v3.11.3\0204c17d97ae463ab3998f3c82c9ea2d\include -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\l\libsodium\1.0.19\f1ff71ff85364fa89c17d828953ae217\include -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\l\libopus\1.4\b21653e6cc7640c79fc8a0123c287890\include -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\o\openssl\1.1.1-w\173d0d1b5847472da4944ece0759b1b4\include -external:W0 -external:IC:\Users\runneradmin\AppData\Local\.xmake\packages\z\zlib\v1.3\bccfcefde78c424c9153cc8d3007dd63\include /Zc:preprocessor -DNDEBUG -Fobuild_fcd2ec62\.objs\dpp\windows\x64\release\src\dpp\discordvoiceclient.cpp.obj src\dpp\discordvoiceclient.cpp
error: @programdir\core\main.lua:309: @programdir\actions\build\main.lua:148: @programdir\modules\async\runjobs.lua:320: @programdir\modules\private\action\build\object.lua:91: @programdir\modules\core\tools\cl.lua:709: cluster.cpp
C:\Users\runneradmin\AppData\Local\.xmake\cache\packages\2312\d\dpp\v10.0.29\source\src\dpp\cluster.cpp : fatal error C1128: number of sections exceeded object file format limit: compile with /bigobj

@Bricklou
Copy link
Contributor Author

How to explicitly exclude arm builds for windows ?

@@ -78,6 +79,10 @@ package("dpp")
if package:version():ge("v10.0.23") then
package:add("defines", "DPP_USE_EXTERNAL_JSON")
end

if package:version():ge("v10.0.29") and is_plat("windows") then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

package:is_plat

@@ -78,6 +79,10 @@ package("dpp")
if package:version():ge("v10.0.23") then
package:add("defines", "DPP_USE_EXTERNAL_JSON")
end

if package:version():ge("v10.0.29") and is_plat("windows") then
package:add("cxxflags", "/bigobj /Gy")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should pass flags to tools.xmake instead of user project.

local cxflags
if package:is_plat("windows") then
    cxflags  = {"/bigobj", "/Gy"}
end
import("package.tools.xmake").install(package, {}, {cxflags = cxflags})

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change doesn't seem to have any effect on the build, the "Windows 2019 shared x64" one is still failing because of the error above 🤔

@waruqi waruqi merged commit 9d90630 into xmake-io:dev Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants